Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(finishes) porting emissives from tgmc #5405

Closed
wants to merge 5 commits into from
Closed

(finishes) porting emissives from tgmc #5405

wants to merge 5 commits into from

Conversation

harryob
Copy link
Member

@harryob harryob commented Jan 8, 2024 •
edited
Loading

i somehow forgot to finish this when i was porting fancy lighting, but its here! and only on light switches (we have two of them in the game, fun!) and morgues!

🆑 TiviPlus
add: emissives! for that fun glow in the dark effect
/:cl:

edit: almost forgot, this finishes off what i started in the lighting port which was from tgstation/TerraGov-Marine-Corps#6678

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jan 8, 2024
@Birdtalon Birdtalon requested a review from a team January 14, 2024 12:41
nauticall
nauticall approved these changes Jan 20, 2024
View reviewed changes
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeppers

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Jan 20, 2024
@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Jan 23, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 23, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 23, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Drulikar
Drulikar requested changes Jan 26, 2024
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Attachments and the character screen (even at round start) do not display any icons with this PR. Tested on live and also confirmed locally:
image
image

@Drulikar Drulikar marked this pull request as draft January 26, 2024 01:16
@Megaddd Megaddd mentioned this pull request Jan 26, 2024
Closed
3 tasks
@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Feb 3, 2024
@github-actions github-actions bot closed this Feb 11, 2024
@cmss13-devs cmss13-devs deleted a comment from github-actions bot Feb 13, 2024
@harryob harryob reopened this Feb 13, 2024
@harryob
Copy link
Member Author

harryob commented Feb 13, 2024

this pr never went stale. 1984 is real

@harryob harryob removed the Stale beg a maintainer to review your PR label Feb 13, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Feb 26, 2024
@github-actions github-actions bot closed this Mar 5, 2024
@Git-Nivrak Git-Nivrak mentioned this pull request Aug 22, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Aug 23, 2024
@Git-Nivrak
Emissive APCs (#7000)
10e1785 
# About the pull request
Adds emissive lights to APCs, Hopefully this PR shows people how easy it
is to add emissives so we can make the game prettier

![image](https://github.com/user-attachments/assets/e0f3c9ad-1a1e-47be-9fd9-e26851dfa34a)

![image](https://github.com/user-attachments/assets/8707353b-beab-4a1b-98d2-4fa956bd84c3)

![image](https://github.com/user-attachments/assets/3a7f65f2-aed0-42aa-8b7a-ffa9bd14f6b1)
Takes inspiration from
tgstation/TerraGov-Marine-Corps#14257 and
tgstation/TerraGov-Marine-Corps#6739 and
#5405
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Makes it prettier
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
qol: APCs are now emissive
code: Added emissive blockers to a bunch of stuff
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar requested changes

@nauticall nauticall nauticall approved these changes

Assignees
No one assigned
Labels
Feature Feature coder badge Merge Conflict PR can't be merged because it touched too much code Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Stale beg a maintainer to review your PR Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@harryob @cm13-github @nauticall @Drulikar